7.8 Fixes and Warp fixes