fix some issues with unicorn