Various small additions...