fixes

lgwc: 9063