Some more fixes

Signed-off-by: netcho <kkotlarski@abv.bg>