Subs fixes