misc bugfix on full-scan + row-store