More SWIG/Android
More checks