clean up some build errors