Some cleanup and fixes

Signed-off-by: Sovak <Sovak007@gmail.com>