Fixed CI issues