Fixed working directory problems