Bug fixes and updates to help with Groovy and plugin integration