Minor fix to all modules