Fix some issues

Signed-off-by: unknown <dsoidiki@vpeinoit-sv.ad.digitick.local>