508 review fixes