Component fixes