Fix some review issues