[Desktop] Various misc. changes