Various small modifications, no new functionality