fixes in modules