Should UTIL_METADATA_OK be added to UTIL_ALL_OK, or should we change the name of the define?