added unicorn fixes