#0  0xb6c5029b in ~XMLTree (this=0xb8) at libs/pbd/xml++.cc:37
#1  0xb7f61a38 in ARDOUR::Session::destroy (this=0xa57c928) at libs/ardour/session.cc:460
#2  0xb7fcba46 in ARDOUR::Session::first_stage_init (this=0xa57c928, fullpath=
        {static npos = 4294967295, _M_dataplus = {<std::allocator<char>> = {<__gnu_cxx::new_allocator<char>> = {<No data fields>}, <No data fields>}, _M_p = 0xbfaa709c "\224�m�l�\001\n\220\020\n��q��&qB\b�\003\212\bPf?\b�q����@\b(�W\np37\n�q��\234q��\230q��\001"}}, snapshot_name=
        {static npos = 4294967295, _M_dataplus = {<std::allocator<char>> = {<__gnu_cxx::new_allocator<char>> = {<No data fields>}, <No data fields>}, _M_p = 0xbfaa70a0 "l�\001\n\220\020\n��q��&qB\b�\003\212\bPf?\b�q����@\b(�W\np37\n�q��\234q��\230q��\001"}})
    at libs/ardour/session_state.cc:103
#3  0xb7f6e070 in Session (this=0xa57c928, eng=@0xa373370, fullpath=@0xbfaa71a0, snapshot_name=@0xbfaa719c, mix_template=
        {static npos = 4294967295, _M_dataplus = {<std::allocator<char>> = {<__gnu_cxx::new_allocator<char>> = {<No data fields>}, <No data fields>}, _M_p = 0xbfaa7198 "\224�m�l�\001\n\224�m�\f+W\n�q��\224�m�����"}}) at libs/ardour/session.cc:302
#4  0x0840c1bf in ARDOUR_UI::load_session (this=0x9e1e260, path=@0xbfaa7254, snap_name=@0xbfaa7258, mix_template=
          {static npos = 4294967295, string_ = {static npos = 4294967295, _M_dataplus = {<std::allocator<char>> = {<__gnu_cxx::new_allocator<char>> = {<No data fields>}, <No data fields>}, _M_p = 0xbfaa7210 "\224�m�4�\a\n4�\a\n1�j�0$-\n��m�\224�m�\224�m�0$-\ntq��tq��"}}})
    at gtk2_ardour/ardour_ui.cc:2441
#5  0x0841ceae in ARDOUR_UI::get_session_parameters (this=0x9e1e260, backend_audio_is_running=true, should_be_new=false)
    at gtk2_ardour/ardour_ui.cc:2372
#6  0x0841d1a5 in ARDOUR_UI::startup (this=0x9e1e260) at gtk2_ardour/ardour_ui.cc:650
#7  0x0842710d in sigc::bound_mem_functor0<void, ARDOUR_UI>::operator() (this=0xa0b818c) at libs/sigc++2/sigc++/functors/mem_fun.h:1787
#8  0x08427124 in sigc::adaptor_functor<sigc::bound_mem_functor0<void, ARDOUR_UI> >::operator() (this=0xa0b8188)
    at libs/sigc++2/sigc++/adaptors/adaptor_trait.h:251
#9  0x08427140 in sigc::internal::slot_call0<sigc::bound_mem_functor0<void, ARDOUR_UI>, void>::call_it (rep=0xa0b8170)
    at libs/sigc++2/sigc++/functors/slot.h:103
#10 0x08429f70 in sigc::internal::signal_emit0<void, sigc::nil>::emit (impl=0xa045240) at libs/sigc++2/sigc++/signal.h:772
#11 0x0842a038 in sigc::signal0<void, sigc::nil>::emit (this=0x9e1e2a8) at libs/sigc++2/sigc++/signal.h:2667
#12 0x0842a04b in sigc::signal0<void, sigc::nil>::operator() (this=0x9e1e2a8) at libs/sigc++2/sigc++/signal.h:2675
#13 0xb6e31015 in Gtkmm2ext::UI::run (this=0x9e1e260, old_receiver=@0x89e67ac) at libs/gtkmm2ext/gtk_ui.cc:224
#14 0x087013c2 in main (argc=2, argv=0xbfaa74c4) at gtk2_ardour/main.cc:335
(gdb) quit

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 8524aef..eac27fc 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -276,16 +276,23 @@ Session::Session (AudioEngine &eng,
 		  string mix_template)
 
 	: _engine (eng),
+	  mmc (0),
 	  _mmc_port (default_mmc_port),
 	  _mtc_port (default_mtc_port),
 	  _midi_port (default_midi_port),
 	  pending_events (2048),
+	  state_tree (0),
+	  butler_mixdown_buffer (0),
+	  butler_gain_buffer (0),
+	  midi_thread (pthread_t (0)),
 	  midi_requests (128), // the size of this should match the midi request pool size
 	  diskstreams (new DiskstreamList),
 	  routes (new RouteList),
 	  auditioner ((Auditioner*) 0),
 	  _total_free_4k_blocks (0),
 	  _click_io ((IO*) 0),
+	  click_data (0),
+	  click_emphasis_data (0),
 	  main_outs (0)
 {
 	bool new_session;
@@ -455,19 +462,16 @@ Session::destroy ()
 	_history.clear ();
 
 	/* clear state tree so that no references to objects are held any more */
-	
-	if (state_tree) {
-		delete state_tree;
-	}
+	delete state_tree;
 
 	terminate_butler_thread ();
 	terminate_midi_thread ();
 	
-	if (click_data && click_data != default_click) {
+	if (click_data != default_click) {
 		delete [] click_data;
 	}
 
-	if (click_emphasis_data && click_emphasis_data != default_click_emphasis) {
+	if (click_emphasis_data != default_click_emphasis) {
 		delete [] click_emphasis_data;
 	}
 
@@ -635,19 +639,12 @@ Session::destroy ()
 		i = tmp;
 	}
 
-	if (butler_mixdown_buffer) {
-		delete [] butler_mixdown_buffer;
-	}
-
-	if (butler_gain_buffer) {
-		delete [] butler_gain_buffer;
-	}
+	delete [] butler_mixdown_buffer;
+	delete [] butler_gain_buffer;
 
 	Crossfade::set_buffer_size (0);
 
-	if (mmc) {
-		delete mmc;
-	}
+	delete mmc;
 }
 
 void
diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 2b7aca6..c769e57 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -155,7 +155,6 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	pending_locate_roll = false;
 	pending_locate_flush = false;
 	dstream_buffer_size = 0;
-	state_tree = 0;
 	state_was_pending = false;
 	set_next_event ();
 	outbound_mtc_smpte_frame = 0;
@@ -171,9 +170,6 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 
 	_slave = 0;
 	_silent = false;
-	butler_mixdown_buffer = 0;
-	butler_gain_buffer = 0;
-	mmc = 0;
 	session_send_mmc = false;
 	session_send_mtc = false;
 	post_transport_work = PostTransportWork (0);
@@ -194,7 +190,6 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	first_file_data_format_reset = true;
 	first_file_header_format_reset = true;
 	butler_thread = (pthread_t) 0;
-	midi_thread = (pthread_t) 0;
 
 	AudioDiskstream::allocate_working_buffers();
 	
@@ -211,8 +206,6 @@ Session::first_stage_init (string fullpath, string snapshot_name)
 	   waveforms for clicks.
 	*/
 	
-	click_data = 0;
-	click_emphasis_data = 0;
 	click_length = 0;
 	click_emphasis_length = 0;
 	_clicking = false;

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 77d0b02..db4b3bc 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -367,7 +367,8 @@ Editor::Editor ()
 
 	range_marker_drag_rect = 0;
 	marker_drag_line = 0;
-	
+
+	_edit_point = EditAtMouse;
 	set_mouse_mode (MouseObject, true);
 
 	frames_per_unit = 2048; /* too early to use reset_zoom () */
diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index eac27fc..6754a51 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -347,14 +347,23 @@ Session::Session (AudioEngine &eng,
 		  nframes_t initial_length)
 
 	: _engine (eng),
+	  mmc (0),
 	  _mmc_port (default_mmc_port),
 	  _mtc_port (default_mtc_port),
 	  _midi_port (default_midi_port),
 	  pending_events (2048),
+	  state_tree (0),
+	  butler_mixdown_buffer (0),
+	  butler_gain_buffer (0),
+	  midi_thread (pthread_t (0)),
 	  midi_requests (16),
 	  diskstreams (new DiskstreamList),
 	  routes (new RouteList),
+	  auditioner ((Auditioner *) 0),
 	  _total_free_4k_blocks (0),
+	  _click_io ((IO *) 0),
+	  click_data (0),
+	  click_emphasis_data (0),
 	  main_outs (0)
 
 {