Android project fixes