Modified Files trying to fix build errors