Bug fixes
Code deduplication
Fix crashes with multimodule applications