Cleaning up some gradle warnings