Get rid of NULL warnings and compiler errors for new typemaps