Minor changes relevant for Desktop use.