Small bug fixes
Small bug fixes

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