Size 0 fixes; other tidying