Small fixes to CI set up