Fixed misc compilation issues
Merge pull request #171 from fabienrohrer/master

Fixed misc compilation issuesFixed misc compilation issues