Fix a few more cinnamon / gnome ports