Fixed the calls to swig templates