Some modules fixed