Suppress warnings for android, minor bug fixes