Fixed new compiler errors.