Add fallback stuff for setting the client early...