Common module fixes