some fixes for client reporting