Fix issues for libs making