Fixing up variable subs..