Various minor changes...