final fixes for 0.6 test release