V4 fixes and updates