Fix some string issues identified by Paradox