Use emmy wrappers
Avoid leaks
Fix combined modifiers