Support for Groovy and other issues