[fix] very last fixes