Address more feedback comments