Labels for external Storages, Bugfixes