bug 1028718 - various page-mod related fixes