Fixed Minor Issues

Fixed Minor issues