Various Minor fixes

Just collecting a couple of fixes as usual. Putting as PR coz I want to know the build server doesn't blow up due to the AssemblyFileVersion being removed.