Fixes on load_session