Question class, Fixes