Adapt to Lunchbox/Pression refactoring
Fix linking