Fixes to warp