More manual fixes