Fixes for cinnamon-desktop