Fixes 2 small glitches