Improvements to script/ci