Improvements to setup process.