Cleanup and locale fix.