Minor Client additions