Some doodle fixes