Warp and Stair fix