Update modules to 3.6 enforced syntax to end complaints