fixup review issues