Issue #162 - Fix android errors