Signed-off-by: Joe Groocock <me@frebib.net>
Fix a few things that changed along the way. Signed-off-by: Joe Groocock <me@frebib.net>