Fixes

Signed-off-by: Andras Toth <andras.toth93@gmail.com>
More fixes

Signed-off-by: Andras Toth <andras.toth93@gmail.com>