fix manifests and layout.conf