Minor fixes to 6.1