Fix some stock cargo bay issues