fixes to remind includeexpr