multiple manual fixes