Fixing some issues with the react 0.11.0 update