Small bug fixes and cleanup in R2Store