Fixes  for dbFlushTests