Org and groovy mode setup fixes.