Myriad of fixes for devenv etc