Ok more updates

This is what we pulled with a live scanner.

C0896, u1016, c0898

Now we can hunt down the issues