setup fixes 2