Fixed Minor issues