bug fixes for saving when metadata is a service.