Some strings are not very well...

This fixes #1279 and #1281
Signed-off-by: Antes <antes@simplemachines.org>