Fix internal/external storages