fixed environment issues