Really nice embarrassing catches, thank you for flagging and debugging!!! Patch fixed both of these :)