Minor fixes after merging develop into feature-webservices