! A few fixes related to previous PR

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