Fixes for static pages