Fixes to 1.8