fix compile errors

[pfedan]

Had to make a few changes to compile without errors.

[johnBuffer]

Thanks !