@jonso Thanks for reporting this. I found the bug for the first case. Will spend some time on the second one.