Various minor fixes from the field