misc Warp 4 fixes/upgrades