Custom components, _watch to appease FF