Fixes for Dist and Quad