clutter and cogl fixes