Also swig fixes from IBM