Addressing 508 issues