more spark fixes from the refactoring found in FT work