Fixed more reference issues after Profile/Session changes
Fixed more reference issues after Profile/Session changes