fix more non-windows build errors
few more
abusing the build-bot
fixed up member variable names, also changed a local variable name shadowing a function name