Code and library updates