Small Fixes

These are some small but important fixes to bugs that were uncovered during the v2020 point release updates/security folding. There are also minor safety checks and some conveniences.