more file adjustements to fix build bugs