Parity with US version, bug fixes