Various patches, working on a philogl example