More small improvements