fix a few more of the patches for gcc 4.8.3