Fix some errors found in build testing + clean-up some issues with last...

Fix some errors found in build testing + clean-up some issues with last changes to remove use of printf() from within the OS.