Address nitpicks