bug fixes

Signed-off-by: gorka ercilla <ercillagorka@gmail.com>