Appendix A fixes