Fix octal and hex values in output