Minor changes for CI