Small fixes from this morning