Package fixes, user fixes

Signed-off-by: Rohit Yadav <bhaisaab@baagi.org>