Fixes issue(s) in saltstack/salt repo issue #11096

Simple fixes for the issues in #11096 of saltstack/salt:develop