Many thanks to @mikecflood and @joed74 for finding these!
The following are fixed.
I am beefing up my testing because both of these passed the tests I had and should not have.