Fixed two distinct awful bugs, one in Appendix, one in pass2