BsComponentState fixes