[FIX] Quickfixes for datastorage