Tidy up fixes, improve setting of ChocolateyInstall