Fix some bugs in 3D subs