Further fixes for module output (borked merge conflict in the past?)