OGNL regen & minor fix