Feature/davids 6.1 fixes

Merging in final 6.1 fixes