Fixed bugs introduced by update in pc library