Small changes on wcm api. fixing minor issues.