Changes and fixes in old modules