Some more fixes (it kinda works with touch screens!)