More manual patches