slight modifications to handle IC's new credential management, and some clean-up