More kiosk/desktop merge fixes. Ouch.