Make things work better on CI

/cc @raymondfeng