Fixes to NeCTAR bootstrap, etc