Various minor fixes from review