Fixed WarpDrive bugs