Fixed some stuff so this can compile
with Wind River