Fixes for changes in package structure