Fix failing CI tests