Add some small improvements