Android related fixes