Fix 'hardcoded' strings