Fixing CI issues