Minor Updates | Bug fix