Fixes corresponding to Reynolds feedback comments