Fixes and wrappers for Subs