Completed small updates for 1.7 compliance
Fools merge