Fixes in modules