Client reference fixes