Fixes from vacation change.