More tweaks to ci script, but this should work