(Bug 2165, 5073) Fix various foundation / converted pages issues