Fix strings and messages