Fix a few things SWIG complains about