Applied loose module changes on further modules and several elements.