(WCM-899) Minor fixes