Static pages fixes