More manual changes