Fixes for complement module.