Minor fixes for session key stuff.