Right on Henrik.

I came up with the same items. Had just converted the code to work on my HW and was testing.
These suggested changes seem to work here on my setup Robert.