Minor tweaks

Signed-off-by: Jorge Omar Vazquez <jorgeomar.vazquez@gmail.com>