1.8 additions and fixes