Misc small improvements
Misc small improvements

3Jade/csbuild,brandonmbare/csbuild,ShadauxCat/csbuild,3Jade/csbuild,3Jade/csbuild,brandonmbare/csbuild,brandonmbare/csbuild,brandonmbare/csbuild,ShadauxCat/csbuild,ShadauxCat/csbuild,ShadauxCat/csbuild,3Jade/csbuild,3Jade/csbuild