Fixed AndroidStudio quirks