STRID-143 Minor fixes to accomodate latest changes on commons.core