Fixes for changes