finalized fixes in unicorn configuration