Minor fixes, avoid defining shouldComponentUpdate