swig fixes