Add some missing bits