508 compliance fixes