Fixes for my version of the component