Oops, add files missed as part of recent commits!