Unicorn tweaks