Resolved the last of the compile errors.