Some fixes from yesterday