Small fixes and a first threesome for Eric+David