More nits - test round 2
More nits