Further fixes to module init