Stop Naval Factories from sinking
First attempt and cleanup
Final version of ACU fix
Port fix to sACU and clean up whitespace
Re-add code that went missing