UTF-8 support and add proper PATH back.