Fixes after core changes