Updates and fixes, for 0x0A