fix problems with migration to 2.3