Some fixes to 6.1