Relax some Warp upper bounds