Session and Callback Fixes