Fix from Paul Wouters to build