Configure ESS, fix some fixes