Real fixes for Fit.