Fixes and changes based on the first install test run