A few notes after the last master merge