Minor last fixes