[v6r11] Few minor fixes from StorageManagement