Fixes on setActive