fixed issues that break ximera