Updates to Catch setup for Unix.