Fixes to get all 1.9 specs passing again.