Minor Client and Common cleanup