Various small changes