Some fixes for expression engine