Misc. fixes

Signed-off-by: plamen911 <plamen@lynxlake.org>