Fix static pages bugs