updates to try and fix build errors