Add basic embedder support
Avoid unnecessary recompiles
Fix output