Merge "misc fixes, including 0xB0B8"