Sitebuilder and dependencies fixes