Updated modules, fixed cld issues