SCDPIII-48 Fix failing features