Small 6.1 fixes / improvements