ComponentBase coffee bug fixes