v3.8, cleanup and fixes