Fixes for warping