Fixes for `invalidate` option