[Desktop] Misc changes / additions