Fix errors with options from DBwq