Updated swig etc.