small fixes during the migration to the new version