Fixing some minor issues with OMS-524 discovered during testing