more manual fixes