Fix modules references