assorted tweaks to fix startup