Changes for MAC using JDK8