Various manual fixes.