@adamkeys The next update (6.0) will be a major revision that fixes the first issue and takes into consideration the second. As always, it will be a free update. It's still a few more weeks away, so you can request an early access by sending an email.