Fix minor issues/glitches