Retirando alguns bugs.

Change-Id: I276686623e5aa57270b604405f51430eb5c74330