fix some obscure references