Make components work again, fixes #460