Repairing trunk; lingering errors in swig