Started manual fixes.