A couple tweaks to allow properly initializing modules