Additional fixes for android studio support