general fixes after bulk conversion