Various minor fixes