Fixes for the fix