Multiple indicator bug fixes