Fixed some string issues occuring during production tests
Authored by: numere 2017-05-27
Parent: [r128]
Child: [r130]