fixes to labels to pass wave 508 testing