Move some bootstrapping to the connected method, #267