...and the fixes