Fixing some groovy like problems
Quite specific Main class settings