Fixing compile errors from imported code.