2.7

Bug fixes