[bin/ff{run,get}nightly] Fix and cleanup