Some last fixes