fixing some issues fix build