Misc changes android studio