Minor changes to com.module.