fixed some swig issues