Beef up wrapper init logic