Fixes to accomodate for breaking merchello changes, not complete