Small fixes from yesterday