I pushed a few more fixes which I think will fix your latest issues. Can you upgrade and check this again?