Some not-working improves.