last fixes for rc1