Various minor changes