Some more FAQ improvements