(Xenon) Some more build fixes