More consistent use of finishStorageFormat
Small fixes