Final (hopefully) patch before RC1