quick fixes 1.7