Drkitty maintain migrate fixes

These are the modifications I would like to make before merging this pull request.