Fixes to better validate the setup and install process