Fixes for several small issues #15682, #15800

Fixes #15682 and #15800.

/cc @sirthias 
yes, that would be a nice bonus