added updates to try and fix build issues