Various fixes

Signed-off-by: Shwetank Dixit <emailshwetank@gmail.com>