Minor tweaks. Disallow shooting/weapon switching at same time