More updates to match recent changes in QCC lib