Various minor changes from PC