Just some small improvements