Fixes to simple expression