Cleaned up and applied patches to 3.8 as well (needed for #43)