Fix various android issues, this will require changes to the ios app