fixes for issues with fast SSDs, v0.20.1-snapshot