A few more missing bits and pieces