Did various fixes in modules