Fixing Compiler errors brought on by the API change.