bug fixes on failsafe addon