All the fixes from yesterday.