[Fixes] - Few bug fixes