joypad fixes (make it optional)