Fix shooting bugs