Tweaks to build a manifest with main class