Fixes for swig