Small backpedalling on some design decisions