2 new patches from philip (missing dep in d/control, further cleanup in build.xml)