Quick fixes 2