A few changes to a couple of modules