minor issues to work on 2 machines