Fixing Minor Issues