Slap on a few missing boilerplates