Fix, Improvements