Well it seems my manual fixes are not needed anymore