Some changes for CI