fix build, some hotfixes