manual fixes for screwups