Fix bug in Components
Remove experimental SingletonElements, they're broken by design