Small, last fixes