Adjustments to client stubs