fix build issues, linages issues and missed changes