Fine tune checks for missing metadata