Some other additions to fix build errors