Compilation Errors

Preparing to make some logging changes, but I needed these changes just to get it to compile against XCC 6.0.2