Fix gradle sync issues