Make some littles fixes on code