Fix Compile Errors (thx andip71)