Misc updates to initial installation