Working on manual fixes