Minor fixes for Q&A