Updates to reflect latest lib changes