Fix compilation errors
Merge pull request #182 from SeannyM/fix-compile

Fix compilation errors