Fix useless null checker and gradle changes