Fixes for appendix