Small fixes to make the sln compile