apply last fixes