Minor fixes in modules