Upgrade CI; Fix some issues related to information schema queries