One more round of changes for the batchfciv

Signed-off-by: mandrews <michael@dixiegunsmith.com>