Speed up initial session setup. Fixes #31