LIB001-606: Slight improvement to static pages