Changes for cinnamon-desktop
More fixes