065 fixes (partial)
0.6.5 fixes and other things
Merge branch '065'