some cleanups from mig bug reports