More last fixes