last fixes before commitment