Fixes in ExpressionManager for apps that want to use the listener