Fixed some issues with session starting