Small changes while fixing bugs for expression pages.