Minor fixes in modules definitions