Fix issues running on IBM Domino