Lucky Code...

The working code was actually just lucky, so we fixed one problem but
just left the two other lucky harmless weird problems.