Unicorn fixes