Fixed INCLIST
Small improvements to the fix of cippino before merge