Fix potencial issue in WAL store
Small changes in DBMaker file