Different small improvements