some minor fixes that got in the way of debugging a separate issue