Commit all the fixes :D