Fix for Installation problems #708 and #652