* more fixes to build inside varnish