Refs #6940 fix warnings; add workspaces of each fit