More manual improvements