making the fixes