Changed a few things to help out old SWIG and to get past old GCC errors.