More desktop app related changes