INT: Component fixes.