manual fixes
manual fixes