Fixed Drive and Shooter Bugs