Some minor enhancements

Signed-off-by: Miguel Angel Reina Ortega <miguelangel.reinaortega@etsi.org>