Fixes for quantifiers + incremental (#2009)