basestring fixes