Ship object and pickup tweaks