More minor changes

Off we go

Signed-off-by: Ignacio Quintero <nacho950@gmail.com>