Fix downsample to include axes and separate x and y