minor bug fixes with new shipyard