Updated components for bugfixes