CI-related fixes