Fix type and add missing strings - by Ugo Raffaele