Uncomment usefull checks