React refactor/kh fixes

Merged Ken Hawkins requested to merge react-refactor/kh-fixes into master

Collecting a few assorted tweaks and fixes.

Edited by Ken Hawkins

Merge request reports