@bnoordhuis These have been addressed.