Fix ports and unusuable code to make shooter test work