Fix default assembly to EntryAssembly, and abstract heading