Minor Fixes

Signed-off-by: BabarMajes <al@neomajes.com>