Fixed a few warp bugs.