Question save and load fixes