fixes for changes