Fixes

Fixes the fixes that necessitated fixes.