Some fixes in modules