Fix a few review issues