Fixes to gapfill and runfba command as needed for refactor