Mono build fixes and minor corrections
Merge pull request #1 from rneatherway/master

Mono build fixes and minor corrections