Fix parse issue and fix API packs if no pack