Fixes for latest version of gradel

Fixes for latest version of gradel