SWIG 3.0.0 Fixes