Fixes from yesterday.