fix a bunch of build errors