Fixes on android app