Various small additions