Various minor issues