Fixed compile errors from Swig.