Various small small improvements