Fixes for a couple little issues found in testing.
Signed-off-by: NRob Clark <robdclark@gmail.com>