More 3.7.30 + fixes