Make some changes to make Lan work properly