Fix a last few cinnamon ports