Address even more feedback comments