Some static page fixes