Flatpages fixes
second flatpages fixes