Unpolished fixes
Merge pull request #2 from rwinch/SPR-11319

Unpolished fixes