Swig fixes