Small fixes for question cloner