Fixed the non-compiling Swig stuff