Fixes for new structure