Some manual fixes