fixes to `fix`