last fixes for util