Brand change. Minor fixes

Brand change. Minor fixes

Signed-off-by: Sidrit Trandafili <forge405@gmail.com>