Avoid to change environment variables in subfolders and other minor changes