Even more fixes

Fixes to fixes.