Bug fixes from yesterday