fixes for the fixes of the fixes