Added 2 of 3 fixes of #164