merge fixes

Signed-off-by: Spyros Gasteratos <morfeas3000@gmail.com>