Minor fixes to the fixes