Pyramid: misc fixes
Villec2: update libs