Fixes to fixes