Fix ResultSets
Better warping?