Fix failing features