Fixed issues with compiling

<ghost edit by eezstreet>