Fix up review issues