Slight updates to SWIG for use with Serment