I've just released a patch for both of these bugs. Wish I could have done it sooner but Christmas and all. Should be no major progression blockers anymore.
