Updates to fix build issue