Yet more modules updates