Question Mark 2: Minor bug fixes

Minor bug fixes.