build errors (and other nits)