more fixes and breakages