Clutter fixes!