FunDisabler Fixes