A few more bugs/glitches