A few fixes with the new manifest file