Few tweaks to make the install process....sorta work