Varioius Fixes

Signed-off-by: Mandeep Singh <mandeep@websterfolks.com>