last fixes until release