Fixes to conform to metadata model.