Mixed extraneous changes, sync with desktop edition