A few console fixes

Fixes for #4486 and #4503