#425 review fixes