-- Library fixes