fix compile errors
Merge pull request #226 from ayr0/fixes2

fix compile errors