Incremental Thursday fixes.