Some unfinished fixes according to new schematic

Signed-off-by: dmarinov <dimitar.m.marinov@abv.bg>