Fix glitches after merging