#1 Fix compilation errors for groovy 2.x