Tweaks on the groovy prebuild script