Fixes to 7.1