Bug fixes & Android SDK update