build fixes

git-svn-id: https://roadrunnerlib.googlecode.com/svn/branches/refactor_modelgen@953 c0027639-9190-0b57-01eb-f09a03790dae
fixed Linux build, all expected tests pass

git-svn-id: https://roadrunnerlib.googlecode.com/svn/branches/refactor_modelgen@954 c0027639-9190-0b57-01eb-f09a03790dae