More fixes on program and directive pages [story:41430161]