Fixing Bennu imports and getXptoSet