Few things missed by the first commit. Oops?