Fixes for building under Mirage 2.1.x
Merge pull request #60 from avsm/master

Fixes for building under Mirage 2.1.x