Some fixes on code integration routines.
Some fixes on code integration routines.

rimenes/reviewit,edmilsonefs/reviewit,edmilsonefs/reviewit,rimenes/reviewit,hugopl/reviewit,rimenes/reviewit,hugopl/reviewit,hugopl/reviewit,edmilsonefs/reviewit