Small updates to some modules