Fix bugs

Signed-off-by: PedroLourenco <PedroLourenco@PedroLourenco>


Signed-off-by: mejaime <mejaime@mejaime-PC.lan>