Various minor issues fixed