Fix some instances of ships' configurations being overwritten