Public client fixes