Fix a few more cinnamon ports