fix pkg id and include lib