Fixing ;-type questions, ready for review