Further tweaks to Naval Cannons