Android fixes
Firther android compile fixes