fixes to modules