minor fixes to silence some spurious errors