Remove some warning and attribute error + todo list for instance