Fixes to reversible expressions and content definition