Act module fixes