Fixed upload dir, ensure iconv has proper defaults