Fix issues with weapons not immediately changing.