Various fixes to make pipeline finish

Various fixes to filters to get Systems A & B to finish.  Still working
on System C's filters.