Some changes and additions for 1.7