more fixes in unicorn task