Some fixes for startup
Update more session files