Added more quto-fixes