fixes for the fixes