Fixing glitches after code review