Minor fixes to previous merge changes.

Signed-off-by: Daniel Medeiros <danielwag@gmail.com>