Fixes related to service metadata