FIX: Fix rerendering issues on some components.