Some fixes for swig warnings.