fixes around unicorn restart