Fixed SWIG helpers