manual fixes