misc fixes

This could be simplified to just `dataSource={this.props.dataSource}`