Fixes to questions