fixes for last changes