Fixes up a bunch of code errors with 'hiding' members, i'm actually surprised our sln even built with this sort of stuff