Fix XYZ issues, use less resources