Initial fixes for program page directive tree