minor to fix 2 bugs and some cleanup
This tag has no release notes.