Fix build errors in CI