! Fix a couple issues with previous PR

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>