unicorn: fixes