Some hacks for smoother controls