minor fixes to the fix