Merge pull request #3579 from paul-elliott-arm/fix_printf

Fixes for invalid printf format specifiers