A few nitpicks