fixing setup issues - cont.