Minor updates

Some bug fixes and making sure the csproj.user file doesn't make it
through!