Groovy devel fixes and updates