misc improvements from HSC install