Some more fixes on slaved subs