fixes for new changes