Fix up some review issues