symmetric fixes from Dave's bug reports