Update modules

I need to find workarounds for some modules.