Use better less options everywhere