fix broken build and sync with gradle