Big data shattuck fixes...