[Desktop] Misc. changes