Minor fixes to make it possible to build for an external dev-site